Nothing overly exciting here, just the usual cleanups of mainly splitting functions into more bite-sized pieces. There are no (well, shouldn't be) real functionality changes, just making everything a tad more readable. Cheers, Peter