Cleaned a bit