Refactor use

Signed-off-by: crynobone <crynobone@gmail.com>
Release v2.1.4

Signed-off-by: crynobone <crynobone@gmail.com>