Fixed errors in spacing and refactoring out of scenario