Cleaned Code some more