Add comments and give back some needless refactoring.