fix the property declaration, and clean up code