More code clean-up Start establishing a simple class architecture