More clean-up

Trying to make a more robust program