done, it saves 15 bytes or so and it definitely looks more elegant.