#78 Code review