Code Clean Up