Refactoring - indents, method order. Regarding #566.