Modified coding style with astyle