Remove Apple's default comment
Add constants for properties keys