A lot of effort went into this #cleanandtidy