pull refactor and strip brackets too