Code Clean First Pass