Minor code cleanup in Blueprints