Cleanup

Small things.