#272 Code review