Small improvements & cleanups