Changed brackets to be neater