Fix various style issues.