My refactor

Feedback would be appreciated! :)