Tidied output & Deal with some mess