#174 Code review