Refactor block syntax