Minor code refactoring and improvements.