Cosmetics: pretty function and variable declarations