Style, semantic and some Jekyll usage refactoring