cleaning up
refactoring names & selectors