removed class variables in favor of method ones