Clean up
Trap: Split out logging
Slow things down