! And some more clean-up

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! And a bit more goodness.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! And even more of the good stuff.

Signed-off-by: Peter Spicer <sleeping@myperch.org>