More robust fix for filename/exts
Go Fmt