Code style changes

* Some style changes for readability