Removed some nesting