good call on the refactoring here (although I'm suspecting you use it elsewhere too and so it wasn't completely a compulsive act of making functions smaller/cleaner ;)