More refactors,
Less errors.