#293 Code review comments