Class commenting and import cleanup