refactoring so it looks like big girl code