#275 Code review