Code style

Apply some simple code clean up stuff.