Refactor block assignation