naming + init clear on memory problem
added a few comments