Refactor boromir