Review issues fix: code style