Cleanup files and whitespace