some small style fixes and a little cleaning up of the way I handle futures