update comments and clear imports