code quality #48