cleaned up stuff added comments