Code cleanup before hand in