#191 Code review