Great suggestion. That changes cleaned things up a bit too.