useless refactoring / beautifying

Change-Id: If12c096facae5743d122ed7391c564d25a8a5150