Getting cleaned up so you can make me even dirtier later