agreed, much cleaner. Updated.