More cleaning, slightly better comments