Commented code, more refactoring.