Coding convention update

Fix some missing/extra spaces and curly braces positions.