Fix formatting, fix metadata