Fixing whitespace and origin descriptio