cleaned up standard