cleaned up omments