Cleanup, remove some redundant brackets