Refactor

Code checks out Ok. =]