Fixed comments and some clean up.