Improve quality. Tests are passed