Formatted and made everything neat