Cleaned Some Code