A bit more commets & refactoring.