ooohkay refactored. I'm learning here