Remove commented code.
Tidy up some js alignmentsa nd whitespace.
Pass over with AutoPEP8.