minor refactors in DerbyManager