Thanks, this does looks neater and keeps the hacky where it belongs.