Fixed indentation and did other niceties.