Remove more whitespaces and whitelines