minor cleanup, improve readability