Remove some whitespace
Fix up RegEx to only match only extension