STY: Fix some whitespace and formatting things