Working on formatting and fixing information