Code cleanup (clarity).