clean up code, use find and show commands now