cleaned some code.