I don't mind if you want to clean this up now. (Seems that this working week I'll have a bit shortage of free time).