Cleaned Some code