language fix
some improvements to best practice