More comments + few cleanups