Edited functions and variables names