hammerhead: code clean

Change-Id: Idf3aebf5f09d50fc2c5f7b437ada11b27a08dbb2