Few more minor changes to format, removed a lot of old commented code.