Code clean up, removed modernizr dependency