Add comments and remove unused imports