Cosmetic changes (whitespace mostly)