Improve commenting, use constants for column family names