coding styles fixes
huge selectors and up / down methods refactoring