Use NLIMBS where appropriate to simplify the code