Rename function for good taste
Remove superflous function