#189 Code review