small changes, before comments