Converts coding style

In an attempt to match the coding style of the project this patch
uses comma-first style and removes semi-colons.

(tests passed)