Rename function and make them more readable