Clean up based on further feedback from @cheddar