This looks neater. No real changes to the code.