Cleanup refactor.
Cleanup refactor.

william-richard/moto,spulec/moto,william-richard/moto,whummer/moto,whummer/moto,whummer/moto,spulec/moto,spulec/moto,william-richard/moto,whummer/moto,william-richard/moto,whummer/moto,spulec/moto,whummer/moto,spulec/moto,william-richard/moto,william-richard/moto,spulec/moto