More refactoring. Resolved spontaneous white lines.