Small style and format changes