Paulo&Michal: Code review changes