minor updates to better format