[001] Refactor and improve readability