Great suggestion, much cleaner now!