Code cleanup (and names)