cleaned up readability and output