code cleanup

Change-Id: I56c6b9dce56300e19ec063b842154cac7a165655