Issue #185 - Code styling