Good work! Much better and cleaner!