Refactoring, deleted unnessesery imports, and arg messages