0016: A bit cleanup