Drop unnecessary level of nesting
Simple cleanup