formatting: moved function location; spacing changes