Cleaning up and making more consistent