domain & DAO code clean up
warnings fixup