The code looks nice now 2.