Reorganized by moving public stuff from this implementation class to the new PropNames class.

Also some misc code cleanup such as removing extraneous whitespace at end of lines, etc.

Author: kwwall