Cleanup and readying for next feature