cleaning up code
some comments