Some basic fixes for formatting.