Getting sassy and refactoring code