Cleanded up comments and removed unused imports