Clean up, typo.
Refactor: Move PropertiesUtils.java to a common project