I have not modified that code, just fixed indent. might replace by method from ```FileNameUtils``` but not relared to PR