Standardizing names and removing unncessary code.
refactoring.