Comments and stuff to clean up a bit