Unify code (Use _XXX for private fields)