More sugar

Signed-off-by: Ken Barber <ken@bob.sh>
More sugar and cleanups

Signed-off-by: Ken Barber <ken@bob.sh>