fix for comment conventions and use properties