#91 Coding style