Use more concise code