refactor: improve readability of code