minor improvements
format consistency