code cleanup #15

Change-Id: Ifb3538318b98909b36668a6711b9a8db9a3e95ac