cleaned up a couple of lines