[refacor] some additional clean up