Small codeoptimization
intermediate changes