Rename function
Remove unnecessary if