minor improvements for consistency
minor improvements for consistency