Using JSX where appropriate