[ref] Clean up a little bit