#341 Coding style