Minor changes & cleanups