Removed superfluous output and comments