Refactoring, cleaining up imports, setting filemode