Tidying up declaration of Emmet code