Added whitespace safeguards, simplified path

Fixed