Clean up a few ugly bits

Prep for adding unattended loop