Added whitespace safeguards, simplified path

ok.