Refactoring and prettifing code. Purely cosmetic.