#39 Code review