minor: removed some comments etc