#190 Code review