clean code

Change-Id: If87474080597a5f99c27e29a50995afb163df9bf