That looks sharp. Should be much easier to maintain.