Huge performance boost + text cleanup