Cleaned up comments and imports