#IGNORE minor cleanups only