Refactoring - indents, method and attributes order. Regarding #566.