Removed some printing and renamed variable