indentation
Various cleanup and refactoring