Tidy up code.
Add basic colour mapping for points.