Refactoring - indents, method order, minor comments change. Regarding #566.