More cleanup
Remove swap file
Whitespace
Restructure