cleaned things up a bit, better comments