renamed methods to more useful names
created conformal variable names, and removed old comments