removed superflous lines and added comments