REFACTOR for https://github.com/prayagupd/nepleaks/issues/9