Proper namings and simplifications.