Clean-up of Design 2.0

Went through and just cleaned up some of the code to make it more
readable in preparation of an attempt at a Design 3.0.