It's that time where I clean up code smells again..