hooray for a proper format