[#72] Use consistent format

* No semicolons and the EOL
* inline 'then' keyword