Come cleanup

/cc @jwswj @danielbreves whaddya think?