Refactor a little in the clear light of day