Code cleanup
Code cleanup, round 2