made more concise and readable