Refactored: remove block refs #194