minor cleanup c/o IDEA code analysis