Clean up, delete the ugly "start()" method