some clean up and added a note to clearify when it is not the best idea to use this assertion.