chore($refactor): code cleanup