Fixed last LINT warnings, space after If and also name of new function reduced to be less than 80 characters