com file loading; refactoring