#226 Code review