Slightly better commenting here and there