#173 Code review