Mainly commenting and some clean up