crypto-007: week 2 slight cleanups