I agree, it looks very ugly and difficult to maintain. If you have suggestions, then I would be very happy to file a follow up issue.