Adding Comments, cleaning up