Housekeeping.
Make more use of extension functions.