Correct file structure
Remove whitespace
Clean up