cleanup + more comments