Refactor computed attributes