renamed files and commented, renamed variables, eliminated unused stuff