refactor the caligual and rome