#38 Code review