Cleanup, more organized start