Improved indentation/comments/consntess

Ditto