Made some minor changes in order to create a better and cleaner output in the terminal