Cleanup

Improved some formatting and removed some comments. Can't actually do much work from school laptops without VS.