refactor files to use new compiler features