Added some slight changes to formatting and such