#218 Code review