Refactor. IE8 Fixes.