A bit of code cleanup; on a +Hangout

Fun no?

:neckbeard: