More debug cleanup, shorter code