Code quality improvement, thanks @nami-doc