Comment branch

Comments and clean up