#12 Still cleaning and reorganizing the code.