removed superflous lines and a ;