Clean up comments, handle import errors