Change variable names; remove unused members