Code cleanup
Indentation should now be consistently 4-space
Some semicolons have been added
Files should end with a newline