Further improved quality of code.