minor changes due to good-looking code