Bugfix: Separating variable usage to solve syntax error. Renamed variables to clearly define differences