Oh, your solution is better, readable and expandable. :)