Cleaned a little #2