Fixes style nits and adds propType validators