Cleaning up for @bryanrite  #48