remove old html helpers
unify code style