Refactor to shorten line