TODO 123 B

1234
  1. - general code review and cleanup
  2. Cc: NeilBrown <neil@brown.name> and Sergio Paracuellos <sergio.paracuellos@gmail.com>