Refactor

Do we need to have this IE8/9 ready? Especially 8...