General code cleanup

Change-Id: If64caa03fc301e11177e54f697002e65375d7ff9