minor refactoring: cleaned scope from services; got rid of $q