a little code clean up and comment clarification