fix variable names
performace inprovement
convert intendation to spaces