#235. Code review