#251 Code review