Code cleanup, and add SystemProperties