Some code cleanup (whitespace and such)