Fixed a bit of cosmetic stuff, code is still very unclean