Fix various issues regarding whitespace