getting rid of the stupid
comments & cleanup
comments & cleanup