reworking properties loading; code cleanup