Just some minor cleanup

Change-Id: I322ab51954be9fd42f93676eadecd24c63b72858