Remove some constants, go fmt things up a bit.