Cleaned up comments and module imports