more cleanup/refactor before bed