Made a bit more concise