more cleanup for clarity