Cleanup, more terse statements, bump