[Improvements][Refactor]