Made output prettier, closing issue #3