- Did some code cleaning, preparing to redesign