Remove extra nesting