Bolt coding style changes