cleaned up formatting to be more uniform across files