Cleaned a lot