Refactor for concise