A bit cleanups