Housekeeping

Part of #39.