doing a little cleaning up and commenting