added return type to all public val/def