Move commands out of execute()