Updating the code to be more consistent