fixing to be more concise