Fix @property annotations and incorrect parenthesis
Remove -property switch