Code cleanup and unifying property getting via enums