Cleans a lot of code
End of day commit.