Score!

Style comments and minor fix (we talked about this strange floating
point thing...)