Remove unnecessary implicit param, minor cleanups