Cleaned a little bit
Cleaned a little more