Code clean-up AquaMaps, make test pass.