refactor and cleanup

Change-Id: Ia59c83978c26cebe060a301ec37bacd805d36ef5
16 files changed