Fix function and white space