Got rid of a lot of ugly.
Made property table helper class