Made fixes pere code review