#158 Code review