cleaning up a bit for the BCC