refactor

I could already hear @jeroenvisser101 telling me that I could make is
smaller :smile: