Better white space removing