More refactoring, but whilst traveling home after quite a few drinks. Hope there are no problems...
Even more refactoring. No comments!