Output is now prettier, added some logic.

Signed-off-by: C5E3B7BD (Will Apodaca) <C5E3B7BD@gmail.com>