First refactor!

Code is prettier.