#207 Code review