Cleaned up code, commented and fixed a lot of indentation

[Xenomer]

intends were very broken here and there. Also commented in a couple of places and added semicolons.