#150 Improved some comments