code cleanup and FileChooser filter (not OSX)