Cleaned a little bit