PCT-671: Removed unnecessary nesting