cleaned up loop vars