updated naming of variables, functions etc to better meet code standards