More restructuring and renaming to help make the code more understandable.