Cleaned a bit more