minor cleanups and less aggressive returns