Improving comments, small memory optimization