minor improvements for consistency