Cleaned up output to be neater