Clean codes up