Cleaned some more :)