#236 Code review