Updated information and Sorted the code