Make the code more concise