Code cleanup & renaming of some properties