removed codebloat, not so many loops now ( I don
't know what I was thinking...)