Cleaning up the code for consistency