chore(*): code clean up