Fix comments
Add FilenameWithoutExt
Fix formatting