Made some statements more concise