Refactor

Here are the results of our refactor!