some light refactoring; start on batch pool
removing some lets in the hope of making things more functional
minor