cleaned some on code