Style:

 - Fix a few formatting issues