Checking that it's not whitespace
Minor tweaks