#267 Code review