WIP: fix whitespace errors