Output and small changes

Made output more readable and did some clean up on useless statements.