Code Clean Up

Please approve this