Optimized some Var-Names and peace of code