tuannv_ clearn up code

tuannn: Clearn up code
please merge for me