minor refactoring (thought this was included in my last push