PropertiesAdapter: Code optimizations