My profile update (pass bug fix + clean code)