remove predeclaration of property and move comment to top