Cleaning mess a bit