The code looks nice now.