Minor changes
Replace limiter if statements with limit method call