Cleaning the Code A Bit