Code Review pull request

What's going on here with the empty i tags? This file might need tidying up.