Remove need for original_path setting and cleaned up files (trailing spaces)

Thanks for your help on my project