clean code

Change-Id: I0e8e887c4bb8b392cc7bc8af2e0620405eae1d6b