Made initial changes to formatting