Used user.is_portfolio? and cleaned up code based on PR comments