Remove whitespace, fix code