Nice! This is much cleaner.