Attempt to clear up some comments a bit