Code quality

Code quality