refactoring
refactored scope
passed first feature spec