minor core readability improvements