Removed cruft & flattened syntax