Style and formatting fixes