Whitespace and function name change as per schos request