selectors and properties order refactoring