foreach, minor cleanup