Minimizing code for simplicity

I have done away with a number of components to simply the code into
easy components that can be more easily manipulated.