Just some clean up and comments

clean up and comments