Fixed the output throughout the tool