#222 Code review