code-comment cleanup and commented unnessecary code parts out