#243 Code review