I think your version is less readable than mine but realize this is pure opinion :)