cleanup: comments and imports