Cleaning up and keeping consistency