Just refactored a little bit whilst I waited for the cleaner to finish, wanted to look like I was doing something important