Better names and removed unused methods.