Some cleanup

@jwswj @danielbreves whaddya think?

/cc @skipjac