Removed warning noise and renamed variables