First crack at “normalizing” the code base to my standards