Tidy whitespace
Fix projects