FIXED: minor cleanups