Refactor and update to use latest contributor blocks