removed superfluous lines and comments