Fixed unnecessary nesting