Addapted the calcserver variables to the code styling