Doing a little more cleanup for consistency