Update coding style and update some formatting