A lot of Code Clean Up