Cleanup, Added Comments