Add accept HTML attribute
Code cleanup