Formatting fixes and small changes