Updated variable names, some commenting