cleanup jsx getter and function return types

cleanup jsx getter and function return types #1215