Some Modularization Modifications

Post-presentation stuff to make the code nicer. There are additional
modifications that can be made, but have not been made yet as it's more
effort and not too helpful in making the code nicer.