More cleaning up - added comments