Cleaning up and making things consistent