cleanup, better comments