#192 Code review