lint cleanup in core
lint cleanup in onset