some removed repetative stuff

some removed repetative stuff