cleaned up comments and import statements