Code Review

Signed-off-by: Miguel M. Almeida <miguelcma@gmail.com>