Cleanup based on @acrichton's feedback