Added better validation which matches the styleguide