cleaned up the last code adjustment