refactor a
Revert "refactor a"

This reverts commit cd44222cdd9ef131b8f9ad29ed679afcfd842aa1.