Some refactoring and trying HTML5 Boilerplate