Made it done work it did

refactored