Minor steps towards cleaning horrid markup